Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prison communications #715

Merged
merged 56 commits into from
Mar 8, 2024
Merged

Conversation

Bonktrauma
Copy link
Contributor

@Bonktrauma Bonktrauma commented Jan 23, 2024

About the PR

Added in the prisoner coms key
Gave prisoners and prison guards new headsets with the prisoner encryption key
Gave warden a box of the keys
Gave security key access to prison key by default

Why / Balance

I wanted an easier way to speak with prisoners without giving them access to security coms

Technical details

Media

additions

  • [ x] I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase

Breaking changes

Changelog
🆑 - BonkTrauma and DangerRevolution

  • add: Added Prisoner communication channel and updated a few headsets to include it

@Bonktrauma Bonktrauma requested a review from DebugOk as a code owner January 23, 2024 21:53
@github-actions github-actions bot added Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an rsi Changes: YML Changes any yml files S: Needs Review labels Jan 23, 2024
Copy link
Contributor

github-actions bot commented Jan 23, 2024

RSI Diff Bot; head commit d2a2b19 merging into 717e81c
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/DeltaV/Clothing/Ears/Headsets/prisoner.rsi

State Old New Status
equipped-EARS Added
icon Added

Resources/Textures/DeltaV/Objects/Devices/encryption_keys.rsi

State Old New Status
crypt_orange Added
prisoner_label Added

Edit: diff updated after d2a2b19

@ps3moira
Copy link
Contributor

ps3moira commented Feb 7, 2024

this is great. is there also a prisoner intercom?

@Bonktrauma
Copy link
Contributor Author

this is great. is there also a prisoner intercom?

I haven't added an intercom, I uh, might, but I'm not sure how the intercoms work since I haven't taken a look at them, prisoners will automatically start with the prisoner com channel so there isn't much point in the intercom in my opinion

@Bonktrauma
Copy link
Contributor Author

ill continue troubleshooting tomorrow

@Bonktrauma Bonktrauma requested a review from VMSolidus February 20, 2024 19:58
@DebugOk
Copy link
Contributor

DebugOk commented Mar 7, 2024

@VMSolidus Please re-review and merge if its good enough

@VMSolidus VMSolidus merged commit 9b783af into DeltaV-Station:master Mar 8, 2024
12 checks passed
DeltaV-Bot pushed a commit that referenced this pull request Mar 8, 2024
@Bonktrauma Bonktrauma deleted the prison-headset branch March 8, 2024 13:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an rsi Changes: YML Changes any yml files S: Needs Review
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants